Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 06:11:19 +0000 (06:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 06:11:19 +0000 (06:11 +0000)

Trivial merge